Remove unused boost test macros
Build fixes