Tests clean up

- Cleaned up tests code base.