warnign test commit: some returns where there shouldnt be