WIP: Refactoring to ForApplication context pattern
Fixed test runner