Very little refactorings and a simple test enhancement.