Small changes, tried fixing the test class(unsuccessfully).