adopted tests for new api structure
Merge pull request #2 from Katafalkas/fix_tests

adopted tests for new api structure