Merge "Allow Uninstantiated Test SapTest"