Second commit, changes to unit testing and controller testing and application layout