Rewrite completion tests for better isolation