Splitting BeanBuilder in different classes + test.