Validators tests clean up

- Cleaned up validators tests code base.
Web tests clean up

- Cleaned up web tests code base.