QA scripts update

Just updated to make it more automated and cleaned couple bugs.