Recommented in new test cases + fixed one test
Minor fixes + new test
Reverted one change
Merge branch 'master' of github.com:sebastian-software/jasy