improve - unit test

use builder in the tests