use gaze to watch test files, and refactor builder logic