Tests are now path agnostic
code cleaning
Organizing tests into separate files