re-enable more tests