* Tidy implementation of validator * Tests improved and moved to tests/integration (as they call resolve internally)