Updating tests to get around Phantom bug