Simplified unit test fix. #15