Improve tests and README examples