Better label parsing + minor changes to tests