Fixed bug that cause "test_definition_with_circular_dependency" test to fail