Correcting mochad interface and test.