Move few tests to last.
Merge branch '6059' of github.com:openscholar/openscholar into 6059