commit changes - fixed models + added tests