Fix a test / Brush up code