Extended test coverage and move baseOptions to head of treeize