test tweaks

Conflicts:
	inst/tests/test-lmer.R