fix a mistake in last commit; fix a mistake in tests