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

refs #4233 moving tests that require a database to integration as those are integration tests per se