More tests and more portable structures definition