More tests and README update