improved context comp tests