Adding unit tests back in