Fix all issues for all tests

Next step two last test