Associate tests correctly (and fix test)