Updated listing process to skip folders if only one to pick from
Added tests for latter