Test Refactoring

This PR has been made to track Travis's reactions to the commits. It's not done quite yet:

- [X] Split tests into files by functionality
- [ ] Test dependencies