add instruments, and some model tests