resolve random spec failures
fix circular dependency errors in development environment