Fix tests

Here's my stab at fixing the existing tests since I noticed they had been disabled.  I'd like to contribute some more tests and functionality so I figured fixing the tests was a good place to start!