More Tests and Test Improvements