Various Test Fixes