Update tests and README