Fixed tests and removed view tests