fix test, cleanup, validation
fix test script