Remove dependency to History class
Add more tests