Make test execution more reliable. Related to #69 and #70