Adjust tests to refactor

Currently fixes Messenger_test, and removes timer_test.