Fix Broken Unit Tests

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