Add validation test, dependency and unit tests
Comment out dependency circle