Removing map file. Updating tests