triger tests passing, models updated w fixtures and formatting