Updated tests so they pass again.