Took out the trash and added testcase