- some adaptations to pass unit tests