Update: Cleanup tests