Make "context test" more comprehensive.