Fixed tests to work with testing bundle.