Refactor build, we're adding tests