DAR-946: Add spaces between spaces classes, test for secondary and big classes