Fixing tests and creating view tests