Another update to app/widgets/Container and _ScrollableMixin to try to deal with the scrollable problems, and update to the tests to better match the failing testcase, this works better but we still need a better way to handle these cases.