changing composer and rearranged tests.