Fix tests so that they pass and test what we want.