Make some tests indepenant of configuration. Issue: #553