Added tests and correct SCM