More cleanup
Renamed module_dir to modules_dir
Removed absolute paths from test config