Fixes tests to configure app context
Fixes scheme issue