Bug fixes, re-enabled tests that needed full history.