Fixing views adding tests