Make tests work, start with name