Cleanup of the Tests

This one should close #25