Added Test Cases, Created new maps to output data, errors around line 302-310