Fixed test error
Merge branch 'master' into gustav