Added tests and also changed views for explicit call due to weird error