Simplify configuration + add tests