Fixed out of date tests that were getting in the way as we try to approach #17