merged some tests
(cherry picked from commit cf61edffa8c7b62ceb44bfc5f290775007f9ea4d)