Added some basic views, some tests