Make tests passing