Bug Fix
Remove tests for functions which will be deprecated soon
Fix unit test
Merge pull request #44 from boiving/master

Bug Fix