Better comments
Add History Tests