Moving towards the new code guidelines; tests fail now