Patched up some tests with fresh data