test wrapper for struct
fix tests