Update structure
add admin env + update fixtures