Start of second pass. More classes, same amount of filth but more evenly
distributed
All single operator tests passing on second attempt