Simplify configuration + add tests
Merge pull request #4 from widop/f-tests

Simplify configuration + add tests