Added more checks to test