Added more tests, and Events pages