Add is and is-a tests