sp-25-rc3 added tests
sp-25-rc3 fixed deadlock
Minor fix.