Fixes to the test to test correctly