Added test coverage and new files/classes/packages