Updated test class with more checks