#23 test improvement