User data structure change && rewrite fixture