updated modules + better scripts for tests