Moved additional compiles into standard build/test stage
Job setup didn't change; they still only run on merge requests