all tests now pass, fixed build module refactor