Updating tests
Fixing broken tests, and adding some of my own