Added expressions to framework
Cleanup validate methods
Introduced mocking to framework