updated fixture service + unit test