removing eval validation, performing better test building