Updating tests with new codebase references