Add rest of solutions and tests