Refacotring: Switch to tape for testing