Added an event method to client and made some tests
Locked down the methods with some more tests