Refactored tests and got them to cover more of the views