Improve tests (fix mistake in previous commit)