Added 3 tests and edited a few bugs we found in the views