Add all unit tests back