Added more tests, ready for the listener loop