Revert "fix tests"

This reverts commit 3d1d05bd2c1be373907b364d31f41bd240a3e510.
Revert "include the top level element in data marker searching algorithm"

This reverts commit a6a3a4a48a74a1a69a7c7d58d470408f06529c59.
2.2.0
2.2.1