Add unit tests for activity controller