Fix RackTest cukes for multitenancy

Also disable a temporary attempt at fixing cukes.
Remove traces of temporary cuke fix attempt