Made changes for the asserts to pass.