Fix/refactor tests

1. Fixed that last test that was broken. Turns out if you use expectMsg and more than one message comes through, the next test gets the left over message, triggering errors
2. Refactored tests to instantiate new anonymous object via a trait; cuts down on vars