Now uses the class's bundle to allow the bundle to be located from non-main bundles e.g. unit test bundles