Various Test Improvements