Added more tests and name previous test better