Fix #7123 - getting abra ready to test