Add old unit tests back although most fail.