FIX testharness to make it smarter