Minor correction
Added tests