More solution fixes, tests