Updates to tests
Merge branch 'master' of https://github.com/Finerminer/SWE400Project1
Merge branch 'master' of https://github.com/Finerminer/SWE400Project1
Merge branch 'master' of https://github.com/Finerminer/SWE400Project1
Merge branch 'master' of https://github.com/Finerminer/SWE400Project1
refactoring list names