Fix explicit builder to run each build once, add tests