Changed to tape test framework