Implement missing tests. 151 Tests passing