Fix some test modeling