Work on fixing tests.
Merge branch '4862' of github.com:openscholar/openscholar into 4862
Merge branch '4862' of github.com:openscholar/openscholar into 4862
Merge branch '4862' of github.com:openscholar/openscholar into 4862
Work on fixing tests.