Improvments for the general test build