Fixed some bugs; added better view to test