Fixed Tests

Need to make more stateful tests so as to prevent cohesion of test code
and production code.