Merge pull request #9 from awaelchli/master

Some tests implemented and minor overall changes