Try to improve expect's asser by adding stacktrace
Additional cleanup