Add tests back