Added more helper methods to unit tests.