Added unit tests and activity configuration