jenv configuration
Unused code
Replace manual stubs with mocks
Simplify TestFilter hierarchy