Add define wrappers to spec files
Continue working on fixing tests