CFY-1431 small refactoring; fixed bug related to changes in the context API
CFY-1431 added a few logs for teardown/validation/bootstrap