Finish up BuildFileManipulator, add tests