more fixes from automated checks
fixes from manual theme unit tests checks