Added tests, etc.