Make tests runnable again