Fixing CircularDependencyError
Fixing tests
Releasing 0.4.20