Added tests and versionadded