fix all tests

mentioned in commit 26a4f1b0

mentioned in commit 44b1d438

mentioned in commit 049ae7fa

mentioned in commit 95917a54

mentioned in commit c4694d12

mentioned in commit 2f5a5da5

mentioned in commit ced68c49

mentioned in commit 1d715f18

mentioned in commit 13e985d4

mentioned in commit f9f460d7

mentioned in commit 3b1b621a

mentioned in commit 80a3a3a1