Refactor

refactored some, moved test list contents into test objects, and then some. See commit messages for details.