Fixes on the test