Moving tests out from core-tests to seperated files