Added fixtures and fix package