Test Jig Bug Fix