change expected output to distinct files

Git is having trouble with comparing when there is changes to expected data. At times this also makes it hard to resolve merge conflicts. One possible solution would be to split every expected entity to a specific file.