fixed tests to represent new models