Finish validators and tests