Fixed T037 & T039
fixing conflicts
Merge branch 'master' of ssh://github.com/bIS2/code
Fixed T043. Deleted fill-data files.