Fixed some tests
Merge pull request #16 from jaytaph/tf

Fixed some tests