history tests + history
Merge branch 'feature_historia'