added builder-based tests