Events controller testing

First test passes
Merge events controller testing with remote updates