+ Adapted tests to  new API. Bugfixing starting now.