Some test and README updates