fix up Layer/XYZ test cases