updated models + added tests