Moving relevant tests to corelib/global