ticket:1 reorganize fixtures