test: fix and re-enable some broken tests