#170, fixed some test cases with generic assertions