Added more unit tests - all unit tests are done now except event controllers