Working through tests to clear up sanity