Got tests working again