Made tests use new views