added tests, comments for builder