Forget about having it as subquery
Remove obsolete regression tests