unfinished testdata
added enums and stuff
reordering and enum friendliness
merged conflicts