! Model class tests + Tree fixes