Added more to tests
Merge branch 'master' of ssh://github.com/benjambj/TFE4140