Fix conflicting tests