Moved setupTestUsers to db + minor changes