Slight adjustment to the builder and an extra test.