Fix static test problems