small improvements in tests