fix views for creating tests
fix merge conflict