Re #1165 - Tests fixed, one keep failing but is no error in test but in
portal...