Added validator stack
Updated test coverage for 100%