Start updating all the tests to ignore users.
Tests now run for most of the scenarios....need to sort out the scenarios that I've missed.