minor improvements in tests