Make tests work