Cleaning up broken unit test