Be more direct in tests