Add additional similar tests