Make tests work ... I know it works