Update unit test to suport new fixture data