Added more tests
Progress