Of improvements and unit tests