change test order
change test names; move function