[MAT-310] Adjust tests and impl to suit