Fix tests and remove unneeded method.