All tests except todos green now.
Solved the focus issue.