Tests: re-enabling old test which was disabled "temporarily" months ago. + Removing one hack + refreshing the expected files