Rearranged tests and added some new