Added one test more and rearranged tests