builder test pass
refactor analyzer