moved invalidbookingexception, done more work to eventhandler, started
working on junit