Add some solutions and tests