Unit test : rearranged