some version check
fix a test that had trouble against 4.1
fix a test that had trouble against 4.1 (2)