tweaks to circular dependency test