All namespace files get a postfix: Bundle.

Continued the cleanup of the Test library.