Fix whitespace to be spaces (when in Rome...)
Updated tests to accomodate new dependency of BundleCollection