Rep 540 - Increased unit test coverage for 3 classes