Fix tests

[gigamorph]

Problem Description:
Currently many unit and integration tests are broken.

Expected Behavior/Solution:
No tests should fail, and redundant/obsolete tests should be eliminated.

[prowns]

@gigamorph - what is the status of this? Should it switched to a new milestone or returned to backlog?

[gigamorph]

It is no longer in progress. I put it back to backlog.