Upgraded builder and minitest