Add solutions and tests for them