#22 more tests