Re-arranged tests.