make test struct more flex