Structs progress
add simple tests