Cleaned up TestLevel now that the Z-Order problem is resolved