Added solutions
Added additional tests