Added some unit and functional tests and amended some of the methods. Added a couple of small changes to the views