#290 Improve Test
#185 Improve test
Exclude Case test from Batoo