* Updated Category / Product unit tests to handle taxonomy changes