Re-testing dojo fixes