Fixed bugs related to previous refactoring
Fixed tests
Authored by: jflavoie 2020-12-01
Parent: [r43]
Child: [r45]