Test Fixes (master-qa-4240)

http://issues.liferay.com/browse/LIFERAYQA-4240