Added self test to test helper. More fix.