+ Minor fixes to the test