Added more tests; updated broken tests
Merge pull request #3 from ugexe/extra-tests

Added more tests; updated broken tests