maybe not apply here, but the new isolation stuff would also allow you to have these class definitions inside your test method (e.g. if they're only used once etc)