Several improvements over all classes
Better tests, 92% coverage