Added new validators and some tests