Added validators. Fixed functional test. #12