Fixed broken tests and broken Everest reference