Tape tests

Nice, new clean version of #63.  Basically, reset to 7c7a100d7d5edf945f69f291e29cb236fdb5e47e and then added the new test files.