fix api and tests
Merge pull request #24 from Design-Collective/quick-fix/fix-api-and-tests

Quick fix/fix api and tests