Add additional tests covering models