fixed broken tests (finally)