Updated tests so they pass.