Make tests pass
Merge pull request #12 from nordsieck/t

Make tests pass