Recoded tests for refactor changes