More encapsulation + test fix