Adjust the API and usage accordingly. Make tests stricter. Since the merging is still faulty, test are broken now. The next commit will fix it by avoiding merging.
Bjoern Rabenstein