Fixed Berlin HBF Bug + Test