Rewrite the bundle functional tests to be better isolated
Rewrite completion tests for better isolation