started refactoring best practices guide
fix broken imports in tests