Fixing base so it passes all tests and has 100% test coverage