Adding more tests and checks