Organized the test code agian.
Reorganise.