adjusted build() method
adjusted unit tests to new builder