Updated tests to new api
Updated old files to new api
Merge branch 'bugfixing' into develop