[KFSQA-1099] Partial changes. No clean run yet. Committing to work on another branch.
[KFSQA-1101] Added @solid to test KFSQA-682.