tests updated and passing