Adding unit tests back