Implemented include_names/exclude_names handling and wrote tests