Better logging
Simplify testing
ignore test files