improve marina testing scripts