Going further with tests and cleaner code