Super view tests and general test clean up