Adding test coverage for newly introduced classes