Added more tests, using no cache