Make the class more testable
Add some unit test with Atoum