Inlined operators so tests now can compile and fixed includes.