Update tests to reflect simpler pages & users.