Recovered existing tests, still need to write more and clean it all up