Updated all origial tests. All tests now passing.