seperate out testing types
add in test directories
add ability to return home