Add more feature tests
Merge branch 'master' of github.com:clarat-org/clarat