Just a small bug
Added tests