Reworked application context, fixed tests

1 job for testfix in 58 seconds (queued for 3 seconds)