Some bugfixes ro runner and test suite