More solutions and tests.