correcting fixtures to be able to pass integration and unit test