* remove validator file and include inside handler * fixes slots and handler circle dep * fix type in tests