Adding non-OSGi tests.