Completed tests and did a bit of cleaning up