#11 improve tests scripts