Added fixtures for tests
more modifications
REmoved unused file