Untangle app from test code.