Updated tests. Passing.