#149: inlining the accessors
#149: redoing the unit test structure
#149