Fixes for PEP8
Clean up test file
Add proper recrusive directory logic