Revised tests to do self.assert and adjusted failed tests so they look for notnone vs. looking for specific answer. Will fix when I figure out patch.