Update tests to be more uniform