fixing test to use tape and cleanup