ContextRework: SIMPLIFICATION
ContextRework: FIXING samples/MobileTest