Giving some unit test love

Added a few new unit tests, cleaned up the old ones, and fixed failing tests. SHAME, SHAME, SHAME. You guys let unit tests stay failing! SHAME!