Minor fixes in Engine

Signed-off-by: Sergey Krivohatskiy <s.krivohatskiy@gmail.com>
Additional test information collecting implemented

Signed-off-by: Sergey Krivohatskiy <s.krivohatskiy@gmail.com>