Working on solver, added all mini tests