#22 test fixed