updating builder; adding hi-lo value; polishing tests