tests, minor improvements