removes hard-coded test path and cleans up code and comments