unittests: Merge SystemTests back into SupportTests.