removing admin, etc
split out tests copying