Updated previous unit tests for ILL/ERR
Refactored and created ConvertEntry