Found and fixed a stupid test mistake
Wasted hours due to a copy-paste error in test *facepalm*
All tests passing, even if fields not explicitly mapped
Started implementing overall total/distinct