Update README
Correct funny test names
Merge branch 'devel'