Product Acceptance Tests Fixes