Cleaned up test setups
Merge branch 'tests' of github.com:quickleft/tv into tests