Restructured tests to separate them from test runs.