More shiro tests