Removed spire dependant code from core-test