Fixed tests and mdhimtst so they compile