Updated tests and cleared some context as segments were not passing tests anymore.