test and scripts
resolved