adjust function signatures to interface
correct unittests for interface changes
Merge pull request #3 from dreeh/master

adjust function signatures to interface