Made unit test code more clean and dry.