added some more tests
Merge pull request #31 from Fattaf/clr-refactoring

added some more tests