Changed order of tests to not go over API limitbefore running last test