Update tests to match code, so they actually pass.