Added unit tests for get_working_directory
More cleanup