Updated test suite and README