Updating to all passing tests