README change and tidy tests a little