Minor fixes in order to fix the test