Added back md5 tests. Clean up.