Moved tests into main project using macros.