Data tests clean up

- Cleaned up data tests code base.