Refactor build using new smpl-build-test