Restructured tests
Added event store