Rename ObjectValidator
Add test for Template and finish renaming ObjectValidator
Add testTemplate