Updated readme and tests are now split out