restuctured tests
make username save for usage with sudo