Cleaning up some sloppiness and adding in some test data