OO and test fixes