todos removed and test data moved

2 jobs for !13 with 31_-_Tests in 6 minutes and 56 seconds (queued for 1 second)
latest merge request