Intermediate commit - test coverage in progress