Fixed test cases
merge confliccccccccttttttsssssssss
Merge pull request #99 from Kopo101/documentationChanges

Fixed test cases