Added full self-check to test4