Add test for BuildPyramid, other minor changes