Added code coverage to unit tests
Added validator as a modifier