added files forgotten
Merge branch 'test_fix' into develop