fixes and add validator testing