Updating the tests for better coverage