Turned on addContext in test, didn't break anything.