changed naming of tests and rearranged tests