Fix completions
Clean up the tests