shuffle tests, edit test and refactor