Refactor to the correct API
Remove useless line
assertEquals => assertSame
Merge pull request #48 from VitSalis/final_corrections

Final corrections