Added test but not running correctly yet
united test is done
Merge branch 'feature/struct' into develop