Bug fixes due to pim-beta3 release. Corrections on tests