Reorganise unit test