Started adding some views, fixed up the tests