Test: Few improvs to the code