Updated README and changed around some tests