Tests updated, tests pass.