Clean up tests

Resolve #6 and Resolve #10