Up to feature testing

Adding a note to myself to fix this later. For now I'll merge the pull request and move on to the TDD project.