Continued Development

Added more test files, cleaned up the tests themselves, moved functions around, and generally continued development.