Improve testharness