Further Test Improvements