little improvement in tests