Adding remaining test coverage