Add fixtures, some validation and tests