STY: Cleaning up tests