Add tests back into project