test improvement, before major rework