FIX: integration test 520 'history'
Merge pull request #325 from reneme/fix_history_test

FIX: Integration Test 520 'history'