some more work on tests
updated readme
Merge branch 'devel' into feature/slurm