Run tests and take appropriate action

[nora-soderlund]

The tests for the original package has not been run. I suspect some tests will have to be modified, and maybe we'll come across some functions that has to be updated as well.