Changes in PSD 12 namespaces
Fixed some unit test files