Updating test-suite to match core