Merge "Add hacking check for testtools.skip"