Cleaned up unit test for products