Made the tests for base pass