Get everything compiling with new OJTest + cappuccino