Coverage around 90%
All coverage, all functions, some methods reordered