WIP: one more test fixed