changes to the tests and scoping user