Use only stable tests and fixes problem with context cloning