made controllers names clearer to be consistent with other files
added unit tests for popupController