Working on validator test now