Simplify building and testing