Fix typos
Fix test configuration

This is a quick'n dirty fix, to be cleaned up in the future.