Added tests and improvements

No match.