modified models. added fixtures. modified tests