Restore missing tests

Ooops, moved the tests in my last commit, but forgot to add the new
paths

This also adds some new tests and updates some documentation