Test review

There are 4 test failing after your changes. Could you take a look please?