rewriting tests to bring up to date