fixing misc issues with tests