Rearranged tests in more logical order and added more basic tests