new features
Added tests