improve tests
Merge pull request #11 from oorion/Improving_tests

improve tests