Added zigzag example and minor updates to tests