Fix validator engine

Also implement a test case for the engine and add it to the test suite
Rename the method