Adding internal validation

Also enabling the tests for internal validation.