Correcting tests to function on clean system.