Enabling more tests for Models